From 6ac86b467e7d386548346e1748b9f764e164697b Mon Sep 17 00:00:00 2001 From: robertlipe Date: Mon, 7 Apr 2014 03:18:36 +0000 Subject: [PATCH] Convenience methods for toString on QStringRef were added to Qt 4 years ago. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4797 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/jeeps/gpscom.cc | 3 +++ gpsbabel/mapfactor.cc | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gpsbabel/jeeps/gpscom.cc b/gpsbabel/jeeps/gpscom.cc index cce09539a..8caa2f1a1 100644 --- a/gpsbabel/jeeps/gpscom.cc +++ b/gpsbabel/jeeps/gpscom.cc @@ -1190,6 +1190,7 @@ int32 GPS_Command_Send_Track_As_Course(const char* port, GPS_PTrack* trk, int32 crs = (struct GPS_SCourse**)xrealloc(crs, (n_crs+1) * sizeof(GPS_PCourse)); crs[n_crs] = GPS_Course_New(); if (!crs[n_crs]) { + if (clp) xfree(clp); return MEMORY_ERROR; } @@ -1203,6 +1204,7 @@ int32 GPS_Command_Send_Track_As_Course(const char* port, GPS_PTrack* trk, int32 clp = (struct GPS_SCourse_Lap**) xrealloc(clp, (n_clp+1) * sizeof(GPS_PCourse_Lap)); clp[n_clp] = GPS_Course_Lap_New(); if (!clp[n_clp]) { + if (clp) xfree(clp); return MEMORY_ERROR; } @@ -1223,6 +1225,7 @@ int32 GPS_Command_Send_Track_As_Course(const char* port, GPS_PTrack* trk, int32 ctk[n_ctk] = GPS_Track_New(); if (!ctk[n_ctk]) { + if (clp) xfree(clp); return MEMORY_ERROR; } *ctk[n_ctk] = *trk[i]; diff --git a/gpsbabel/mapfactor.cc b/gpsbabel/mapfactor.cc index 4b5983dcc..3d0912c10 100644 --- a/gpsbabel/mapfactor.cc +++ b/gpsbabel/mapfactor.cc @@ -54,8 +54,8 @@ void MapfactorRead() QXmlStreamAttributes a = reader.attributes(); wpt->shortname = a.value("name").toString(); - wpt->latitude = a.value("lat").toDouble() / milliarcseconds; - wpt->longitude = a.value("lon").toDouble() / milliarcseconds; + wpt->latitude = a.value("lat").toString().toDouble() / milliarcseconds; + wpt->longitude = a.value("lon").toString().toDouble() / milliarcseconds; } } -- 2.30.2